From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 12 Jul 2011 16:33:27 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~89
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=267665bb6201fa2c6f6a0c04de90005d63389716;p=emacs.git

Merge from trunk.
---

267665bb6201fa2c6f6a0c04de90005d63389716